Merge with xen-unstable.hg.
authorHollis Blanchard <hollisb@us.ibm.com>
Wed, 29 Nov 2006 20:16:36 +0000 (14:16 -0600)
committerHollis Blanchard <hollisb@us.ibm.com>
Wed, 29 Nov 2006 20:16:36 +0000 (14:16 -0600)
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

Trivial merge